From: Jens Frank <jeluf@users.mediawiki.org>
Date: Sun, 24 Apr 2005 10:07:05 +0000 (+0000)
Subject: BUG#1831 - Enotif patches for Wikinaut
X-Git-Tag: 1.5.0alpha1~154
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/%22%24ccApp/%28%5B%5E/%7B%24admin_url%7Dcompta/comptes/%27%40url%40/%7B%7B%20url_for%28%27login%27%29%20%7D%7D?a=commitdiff_plain;h=92c122bc67d17fd563d31e888d25e8c5d7c03a75;p=lhc%2Fweb%2Fwiklou.git

BUG#1831 - Enotif patches for Wikinaut
---

diff --git a/config/index.php b/config/index.php
index 1c3e0017fb..5329ccc049 100644
--- a/config/index.php
+++ b/config/index.php
@@ -838,11 +838,8 @@ if( count( $errs ) ) {
 		</ul>
 	</dd>
 	<dt>
-		<p><?php
-			$ccEnotif = htmlspecialchars( 'http://meta.wikipedia.org/Enotif' );
-			print "<a href=\"$ccEnotif\">E-mail notification</a>";
-		?>
-		 sends a notification e-mail to a user, when the user_talk page is changed
+		<p>
+		E-mail notification sends a notification e-mail to a user, when the user_talk page is changed
                 and/or when watch-listed pages are changed, depending on the above settings.
 		When testing this feature, be reminded, that obviously an e-mail address must be present in your preferences
 		and that your own changes never trigger notifications to be sent to yourself.</p>
@@ -863,11 +860,8 @@ if( count( $errs ) ) {
 		</ul>
 	</dd>
 	<dt>
-		<p><?php
-			$ccEauthent = htmlspecialchars( 'http://meta.wikipedia.org/Eauthent' );
-			print "<a href=\"$ccEnotif\">E-mail address authentication</a>";
-		?>
-		 uses a scheme to authenticate e-mail addresses of the users. The user who initially enters or who changes his/her stored e-mail address
+		<p>
+		E-mail address authentication uses a scheme to authenticate e-mail addresses of the users. The user who initially enters or who changes his/her stored e-mail address
 		gets a one-time temporary password mailed to that address. The user can use the original password as long as wanted, however, the stored e-mail address
 		is only authenticated at the moment when the user logs in with the one-time temporary password.<p>
 
diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index 7b5fea8e35..0702ed42c6 100644
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -35,7 +35,6 @@ class LoginForm {
 	 */
 	function LoginForm( &$request ) {
 		global $wgLang, $wgAllowRealName, $wgEnableEmail;
-		global $wgEmailAuthentication;
 
 		$this->mName = $request->getText( 'wpName' );
 		$this->mPassword = $request->getText( 'wpPassword' );